Disable NaT support, fast tick and improved PAL support until

multi-domain stabilizes

diff --git a/xen/arch/ia64/dom_fw.c b/xen/arch/ia64/dom_fw.c
index e369fa4c26d49101f40e8012a20484f03cebfff6..d606edafe20747ea5b69fb15f6b674f358850d06 100644 (file)
--- a/xen/arch/ia64/dom_fw.c
+++ b/xen/arch/ia64/dom_fw.c
@@ -291,6 +291,10 @@ xen_pal_emulator(unsigned long index, unsigned long in1,
        long r11 = 0;
        long status = -1;
 
+#define USE_PAL_EMULATOR
+#ifdef USE_PAL_EMULATOR
+       return pal_emulator_static(index);
+#endif
        if (running_on_sim) return pal_emulator_static(index);
        if (index >= PAL_COPY_PAL) {
                printk("xen_pal_emulator: UNIMPLEMENTED PAL CALL %d!!!!\n",

diff --git a/xen/arch/ia64/hyperprivop.S b/xen/arch/ia64/hyperprivop.S
index 7c6d0146f9539eb2f529f383f1da4463e03963b0..c97f332c7fc751e2b643dfa40a5d10c91602685d 100644 (file)
--- a/xen/arch/ia64/hyperprivop.S
+++ b/xen/arch/ia64/hyperprivop.S
@@ -18,7 +18,7 @@
 #define FAST_HYPERPRIVOPS
 #define FAST_HYPERPRIVOP_CNT
 #define FAST_REFLECT_CNT
-#define FAST_TICK
+//#define FAST_TICK
 #define FAST_BREAK
 #define FAST_ACCESS_REFLECT
 #define FAST_RFI
@@ -27,8 +27,8 @@
 #undef RFI_TO_INTERRUPT // not working yet
 #endif
 
-// FIXME: turn off for now... fix zero'ing regs, should be bank1?
-#define HANDLE_AR_UNAT
+// FIXME: turn off for now... but NaTs may crash Xen so re-enable soon!
+//#define HANDLE_AR_UNAT
 
 // FIXME: This is defined in include/asm-ia64/hw_irq.h but this
 // doesn't appear to be include'able from assembly?